merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Mon, 20 Nov 2006 20:11:15 +0000 (13:11 -0700)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Mon, 20 Nov 2006 20:11:15 +0000 (13:11 -0700)

Trivial merge